gesture: make gtk_gesture_cancel_sequence() private

diff --git a/gtk/gtkgesture.c b/gtk/gtkgesture.c
index 131d6cabc948c3e8122300e7c5fd8027c3285d00..8b993543006c3d3634e0c489711e709e01cd593e 100644 (file)
--- a/gtk/gtkgesture.c
+++ b/gtk/gtkgesture.c
@@ -539,7 +539,7 @@ gtk_gesture_handle_event (GtkEventController *controller,
         g_signal_emit (gesture, signals[UPDATE], 0, sequence);
       break;
     case GDK_TOUCH_CANCEL:
-      gtk_gesture_cancel_sequence (gesture, sequence);
+      _gtk_gesture_cancel_sequence (gesture, sequence);
       break;
     default:
       /* Unhandled event */
@@ -1244,19 +1244,9 @@ gtk_gesture_handles_sequence (GtkGesture       *gesture,
   return TRUE;
 }
 
-/**
- * gtk_gesture_cancel_sequence:
- * @gesture: a #GtkGesture
- * @sequence: a #GdkEventSequence
- *
- * Cancels @sequence on @gesture, this emits #GtkGesture::cancel
- * and forgets the sequence altogether.
- *
- * Returns: #TRUE if the sequence was being handled by gesture
- **/
 gboolean
-gtk_gesture_cancel_sequence (GtkGesture       *gesture,
-                             GdkEventSequence *sequence)
+_gtk_gesture_cancel_sequence (GtkGesture       *gesture,
+                              GdkEventSequence *sequence)
 {
   GtkGesturePrivate *priv;
   PointData *data;

diff --git a/gtk/gtkgesture.h b/gtk/gtkgesture.h
index c90b8f1f1a05529cbd7f76995702fb57acdba88f..cac48aae74ad4da3b838ce7c6f4a5fb1a8f9be71 100644 (file)
--- a/gtk/gtkgesture.h
+++ b/gtk/gtkgesture.h
@@ -67,9 +67,6 @@ GDK_AVAILABLE_IN_3_14
 gboolean    gtk_gesture_handles_sequence     (GtkGesture       *gesture,
                                               GdkEventSequence *sequence);
 GDK_AVAILABLE_IN_3_14
-gboolean    gtk_gesture_cancel_sequence      (GtkGesture       *gesture,
-                                              GdkEventSequence *sequence);
-GDK_AVAILABLE_IN_3_14
 const GdkEvent *
             gtk_gesture_get_last_event       (GtkGesture       *gesture,
                                               GdkEventSequence *sequence);
@@ -97,9 +94,6 @@ gboolean    gtk_gesture_is_active            (GtkGesture       *gesture);
 GDK_AVAILABLE_IN_3_14
 gboolean    gtk_gesture_is_recognized        (GtkGesture       *gesture);
 
-GDK_AVAILABLE_IN_3_14
-gboolean    gtk_gesture_check                (GtkGesture       *gesture);
-
 GDK_AVAILABLE_IN_3_14
 GdkWindow * gtk_gesture_get_window           (GtkGesture       *gesture);
 

diff --git a/gtk/gtkgestureprivate.h b/gtk/gtkgestureprivate.h
index d66b3ee0939a6b17caf0bb21ca1d6e37489e68c2..30c4cd44e2ad57da6f36d2d35872da221859c6f4 100644 (file)
--- a/gtk/gtkgestureprivate.h
+++ b/gtk/gtkgestureprivate.h
@@ -63,6 +63,9 @@ gboolean _gtk_gesture_get_pointer_emulating_sequence
                                                 (GtkGesture        *gesture,
                                                  GdkEventSequence **sequence);
 
+gboolean _gtk_gesture_cancel_sequence        (GtkGesture       *gesture,
+                                              GdkEventSequence *sequence);
+
 G_END_DECLS
 
 #endif /* __GTK_GESTURE_PRIVATE_H__ */

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 98569ad8d12c5ad2df52a96d25e6d5018f9b66d2..3a8205e98c423e3bba6a9eabf2c1f24df531dfd3 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4290,8 +4290,7 @@ _gtk_widget_cancel_sequence (GtkWidget        *widget,
       if (!gtk_gesture_handles_sequence (gesture, seq))
         continue;
 
-      handled |=
-        gtk_gesture_cancel_sequence (gesture, seq);
+      handled |= _gtk_gesture_cancel_sequence (gesture, seq);
     }
 
   return handled;